Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add elasticsearch exporter. Drop Puppet 3 support. #51

Merged
merged 4 commits into from
Oct 4, 2017
Merged

Add elasticsearch exporter. Drop Puppet 3 support. #51

merged 4 commits into from
Oct 4, 2017

Conversation

rbestbmj
Copy link

@rbestbmj rbestbmj commented Aug 8, 2017

Implement the elasticsearch exporter.

bastelfreak
bastelfreak reviewed Sep 24, 2017
View reviewed changes
manifests/elasticsearch_exporter.pp Outdated
$version = $::prometheus::params::elasticsearch_exporter_version,
) inherits prometheus::params {
$real_download_url = pick($download_url,"${download_url_base}/download/v${version}/${package_name}-${version}.${os}-${arch}.${download_extension}")
validate_bool($purge_config_dir)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @rbestbmj, thanks for this PR! Can you replace those legacy functions with native puppet datatypes?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bastelfreak I've added the datatypes.

@rbestbmj rbestbmj force-pushed the elasticsearch_exporter branch from 54e3bdc to 94e9322 Compare October 2, 2017 15:29
@bastelfreak
Copy link
Member

Thanks!

@bastelfreak bastelfreak merged commit e9d3487 into voxpupuli:master Oct 4, 2017
@bastelfreak bastelfreak added the enhancement New feature or request label Oct 4, 2017
bramblek1 added a commit to bramblek1/puppet-prometheus that referenced this pull request Oct 23, 2017
@bramblek1
Squashed Fixes based on PR feedback and merges from master
f3ff86e 
Squashed commit of the following:

commit 63fa492
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Mon Oct 23 11:51:44 2017 +1100

    *fix* add puppet param types to all blackbox_exporter params

commit 0cd0817
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Mon Oct 23 11:44:47 2017 +1100

    *fix* boneheaded use of scope.lookupvars in template, advice from bastelfreak

commit bf6e811
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 11:52:24 2017 +1100

    *fix* ambigious blackbox_exporter_global_config and blackbox_exporter_modules , use 'modules'

commit ff08dcd
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 11:25:14 2017 +1100

    lint - vertical aligmnent love for blackbox_exporter params

commit 35177fd
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 11:21:08 2017 +1100

    replace validate_* function calls with param Types

commit cd00802
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 11:08:04 2017 +1100

    *fix* blackbox spec tests. FACEPALM - s/_/-/ one character error in config filename

commit b411a0e
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 10:48:31 2017 +1100

    *fix* ambigious $config_file param defaults

commit 07af2d1
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 10:33:57 2017 +1100

    *fix* missing blackbox_exporter_download_url_base param

commit 1f21468
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 10:33:24 2017 +1100

    *fix* missing param config_mode

commit e5bdf32
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 10:24:18 2017 +1100

    *fix* syntax  and style in spec tests

commit aca062d
Merge: 61605b3 85ff0c8
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Thu Oct 19 09:57:07 2017 +1100

    Merge remote-tracking branch 'upstream/master' into blackbox_exporter

commit 85ff0c8
Merge: 7d16ce1 704b660
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Wed Oct 18 13:55:37 2017 +0200

    Merge pull request voxpupuli#71 from viq/master

    Add nginx-vts-exporter

commit 704b660
Author: viq <vicviq@gmail.com>
Date:   Wed Oct 18 13:49:50 2017 +0200

    Further test improvements

commit 0c8c11b
Author: viq <vicviq@gmail.com>
Date:   Wed Oct 18 13:46:24 2017 +0200

    Basic test for nginx_vts_exporter

commit bb48133
Author: viq <vicviq@gmail.com>
Date:   Wed Oct 18 13:42:48 2017 +0200

    Add puppet4 datatypes

commit b34fd46
Author: viq <vicviq@gmail.com>
Date:   Wed Oct 18 13:24:00 2017 +0200

    Add nginx-vts-exporter

commit 7d16ce1
Merge: fbeea9f 73deb06
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Fri Oct 13 19:58:16 2017 +0200

    Merge pull request voxpupuli#68 from mdebruyn-trip/master

    Add pushgateway

commit 73deb06
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 13:41:42 2017 -0400

    fix pushgateway spec formatting

commit e7fc0d4
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 13:39:34 2017 -0400

    Adding Datatypes to the pushgateway class

commit 15c69bd
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 13:32:01 2017 -0400

    fix options

commit b394e58
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 13:12:00 2017 -0400

    Add pushgateway spec test

commit 217aa8c
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 12:57:13 2017 -0400

    fix comment version number

commit d487177
Author: Mike DeBruyn <mdebruyn@flipkey.com>
Date:   Fri Oct 13 11:29:02 2017 -0400

    Adding pushgateway

commit fbeea9f
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 13:23:25 2017 -0700

    [blacksmith] Bump version to 2.0.1-rc0

commit 63f09d2
Merge: 6a74346 f55900e
Author: Lee Lowder <l.lowder@keepingyouhonest.net>
Date:   Thu Oct 12 14:27:53 2017 -0500

    Merge pull request voxpupuli#67 from bastelfreak/rel200

    release 2.0.0

commit f55900e
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 12:07:30 2017 -0700

    release 2.0.0

commit 6a74346
Merge: 72b34ff eeb173a
Author: David Hollinger III <david.hollinger@moduletux.com>
Date:   Thu Oct 12 14:11:49 2017 -0500

    Merge pull request voxpupuli#66 from bastelfreak/rel200

    release 2.0.0

commit 72b34ff
Merge: bc0b915 3f1b6ce
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 21:11:03 2017 +0200

    Merge pull request voxpupuli#46 from salekseev/feature_mongodb_exporter

    Added mongodb_exporter

commit eeb173a
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 12:07:30 2017 -0700

    release 2.0.0

commit bc0b915
Merge: 18bb74b 0d4d3b2
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 20:59:49 2017 +0200

    Merge pull request voxpupuli#65 from bastelfreak/bumpversions

    Bump versions for archive and puppet dependency/support puppet5

commit 0d4d3b2
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 11:52:28 2017 -0700

    bump archive upper boundary to work witha latest versions

commit 426dda2
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 11:52:08 2017 -0700

    bump puppet upper boundary to work witha latest versions

commit 18bb74b
Merge: e9d3487 fc98f0c
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Thu Oct 12 20:47:04 2017 +0200

    Merge pull request voxpupuli#64 from salekseev/fix_elasticsearch_exporter

    Add tests for elasticsearch_exporter and update a bit

commit fc98f0c
Author: Stas Alekseev <stas.alekseev@gmail.com>
Date:   Thu Oct 12 10:59:01 2017 -0400

    Add tests for elasticsearch_exporter and update a bit

commit 3f1b6ce
Author: Stas Alekseev <stas.alekseev@gmail.com>
Date:   Thu Oct 12 10:29:45 2017 -0400

    Convert prometheus::mongodb_exporter to use native Puppet 4 data types and add requested test

commit e9d3487
Merge: ce6150d 94e9322
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Wed Oct 4 20:59:35 2017 +0200

    Merge pull request voxpupuli#51 from rbestbmj/elasticsearch_exporter

    Add elasticsearch exporter

commit 94e9322
Merge: 971f6f9 db42bfb
Author: Rob Best <rbest@bmj.com>
Date:   Mon Oct 2 16:25:08 2017 +0100

    Merge branch 'elasticsearch_exporter' of github.com:rbestbmj/puppet-prometheus into elasticsearch_exporter

commit 971f6f9
Author: Rob Best <rbest@bmj.com>
Date:   Mon Oct 2 16:19:20 2017 +0100

    Replace legacy function with native puppet datatypes

commit 67e17fe
Author: Rob Best <rbest@bmj.com>
Date:   Tue Aug 8 13:21:50 2017 +0100

    Add elasticsearch exporter

commit ce6150d
Merge: 4288526 4f47978
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Mon Sep 25 13:37:12 2017 +0200

    Merge pull request voxpupuli#44 from vrtdev/feature/cleanup_and_document

    Feature/cleanup and document

commit 4288526
Merge: f0c8368 7f2bd40
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Sun Sep 24 14:26:23 2017 +0200

    Merge pull request voxpupuli#49 from sathieu/default_collectors

    Use default collectors if "collectors" param is empty

commit f0c8368
Merge: 3231306 4d5a3e4
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Sun Sep 24 14:25:11 2017 +0200

    Merge pull request voxpupuli#50 from sathieu/DAEMON-info

    $DAEMON info is only available for the prometheus daemon

commit 3231306
Merge: 2d71b9e 6598d55
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Sun Sep 24 14:22:18 2017 +0200

    Merge pull request voxpupuli#53 from sathieu/nocompress

    Allow uncompressed daemons

commit 2d71b9e
Merge: 12b68e0 9bd0a64
Author: Will Yardley <wyardley@users.noreply.github.com>
Date:   Fri Sep 15 16:21:27 2017 -0700

    Merge pull request voxpupuli#61 from voxpupuli/modulesync

    modulesync 1.1.0

commit 9bd0a64
Author: David Hollinger <david.hollinger@nttsecurity.com>
Date:   Fri Sep 15 16:31:36 2017 -0500

    modulesync 2017-09-15

commit 12b68e0
Author: Julian Taylor <juliantaylor108@gmail.com>
Date:   Thu Sep 14 08:34:16 2017 +0200

    Remove systemd module dependency and fix missing path for a exec (voxpupuli#58)

    * Remove systemd module dependency

    camptocamp/systemd only replaces a single exec but can cause conflicts
    with the many other systemd puppet modules around.

    * fix missing path for an exec

commit f7deced
Merge: 6b1b3ba 00b9f23
Author: Tim Meusel <tim@bastelfreak.de>
Date:   Sat Sep 9 13:32:12 2017 +0200

    Merge pull request voxpupuli#43 from billyperformance/reload_config

    Reload config

commit 6b1b3ba
Author: Richard Steinbrück <richard.steinbrueck@googlemail.com>
Date:   Thu Sep 7 13:21:18 2017 +0200

    Update README.md (voxpupuli#56)

    Fix typo

commit 6598d55
Author: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date:   Wed Aug 16 16:21:11 2017 +0200

    Allow uncompressed daemons

    This is the case for the apache and postgres exporters

commit db42bfb
Author: Rob Best <rbest@bmj.com>
Date:   Tue Aug 8 13:21:50 2017 +0100

    Add elasticsearch exporter

commit 4d5a3e4
Author: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date:   Tue Aug 8 11:45:59 2017 +0200

    $DAEMON info is only available for the prometheus daemon

commit 61605b3
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Mon Aug 7 15:55:03 2017 +1000

    *fix* hardcoded notify of Service when config_file changes

commit 9d531d2
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Mon Aug 7 15:42:39 2017 +1000

    *fix* variable name in config file template (copy paste bites again)

commit 3944ffd
Author: Andrew Bramble <andrew.bramble@katana1.com>
Date:   Mon Aug 7 15:40:34 2017 +1000

    *fix* missing $config_file in params

commit 7f2bd40
Author: Mathieu Parent <Mathieu.PARENT@nantesmetropole.fr>
Date:   Tue Aug 1 17:44:04 2017 +0200

    Use default collectors if "collectors" param is empty

commit 86f298c
Author: Stas Alekseev <stas.alekseev@gmail.com>
Date:   Wed Jul 19 21:07:11 2017 -0400

    Added unit test for mongodb_exporter

commit 3f44c25
Author: Stas Alekseev <stas.alekseev@gmail.com>
Date:   Tue Jul 18 17:31:05 2017 -0400

    Added mongodb_exporter class

commit 4f47978
Author: Jeroen Hooyberghs <jeroen@hooyberghs.org>
Date:   Mon Jun 26 10:43:54 2017 +0200

    Set default to installed, undef does not make any sense

commit 9c91809
Author: Jeroen Hooyberghs <jeroen@hooyberghs.org>
Date:   Mon Jun 26 10:41:37 2017 +0200

    Add documentation for the params

commit d922efd
Author: Jeroen Hooyberghs <jeroen@hooyberghs.org>
Date:   Mon Jun 26 09:32:09 2017 +0200

    Use scoped variables

commit 00b9f23
Author: Davide Ferrari <vide80@gmail.com>
Date:   Fri Jun 23 10:55:19 2017 +0200

    Replaced internal systemd reload with external systemd module's one

commit feb8519
Author: Davide Ferrari <vide80@gmail.com>
Date:   Thu Jun 22 15:55:52 2017 +0200

    restore puppet4 alerts

commit 9520e24
Merge: 635d393 56dbfab
Author: Davide Ferrari <vide80@gmail.com>
Date:   Thu Jun 22 15:52:14 2017 +0200

    Merge branch 'master' into reload_config

commit 635d393
Author: Davide Ferrari <vide80@gmail.com>
Date:   Thu Jun 22 15:25:29 2017 +0200

    Rebased against voxpupuli/master

commit 8bf302a
Author: Davide Ferrari <vide80@gmail.com>
Date:   Tue Jun 20 17:10:40 2017 +0200

    Fix alerts in our puppet3 branch

commit 0ae4c30
Author: Davide Ferrari <vide80@gmail.com>
Date:   Tue Jun 20 16:52:37 2017 +0200

    Implemented service reload for Prometheus

    With this commit all the configuration files that can be reload on-the-fly
    like prometheus.yml and alerts rules do not trigger a full service restart
    like they did til now.
    I left the possibility to choose if a change to a command-line flag should
    or not restart prometheus (thus applying the change on puppet run) with
    the already existing  flag (still true by default).

commit f945188
Author: Davide Ferrari <vide80@gmail.com>
Date:   Tue Jun 20 11:16:17 2017 +0200

    Backport alerts to puppet3
@alexjfisher alexjfisher changed the title Add elasticsearch exporter Add elasticsearch exporter. Drop Puppet 3 support. Oct 23, 2017
Rovanion pushed a commit to Rovanion/puppet-prometheus that referenced this pull request May 5, 2021
@bastelfreak
Merge pull request voxpupuli#51 from rbestbmj/elasticsearch_exporter
c91db94 
Add elasticsearch exporter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bastelfreak bastelfreak bastelfreak left review comments

Assignees
No one assigned
Labels
backwards-incompatible enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rbestbmj @bastelfreak @alexjfisher